Did some template refactoring and added template of Nina Gerling