Added layout tweaks