Optimize sass and template
Minor changes