Update Design and Clean CSS and HTML code