Minor bug fixes and styling tweaks