Made some layout tweaks