Some layout and styling tweaks