Misc. styling and layout changes