Reorders markup in header to work with fixed feature design