Small refactor + start to create the user info form