Bug fixes and styling tweaks