Styling and bug fixes