Patch follows, but it should be carefully reviewed.
Created attachment 1040 [details] [review] switches to the new layout
committed
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.