Updated scss and template