little pagenav improvement
User entity and form updates and improvements