More additions and reviews to the template