Fixing formatting and styling