Updated collaspe styling
Also started to indent templates