Changed styling and removed templates