tidy up html and css
Merge branch 'develop'