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