Layout tweaks done, up to 2012