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