Added view templates and adjusted navigation