Draft 2

Fixes to compile with standard SCSS