Many template/sass changes
To go with previous commit