Minor fixes and styling updates