Changed CSS and HTML layout