Major overhaul with Sass