Styles and layout changes
Big update