Neaten up code in scss files, change routes