Form changes (https://trello.com/c/qdEoUDl1)