changed some templates around to make things look cleaner