Various fixes and styling