Remove base.sass
Improve layout further