Updates to many templates and finished off styling