Confluence gotham positioning

Changes to bring Confluence up to Gotham's positioning system.

For @ronie to look at.  Am happy to drop all, some or none of the commits :)