Updated as per feedback

https://trello.com/c/DN8P8bsc/9-form-and-list-bugs-enh