SCSS / Template Changes

Updated SCSS & tidied up template