Added people details and small template refactor