Refactor SASS, Make HTML more consistent