Updates to scss files, layout reformatting