Formatting

new scss formatting, tidy up comments, html, etc