Updated templates - added more style