Styling Updates and bug fixes