Started to tidy CSS and HTML