Layout tweaks done for now