Misc fixes and styling