Updated most of the style issues from Design review