Updated sass and template