Buttons missing on Add New screens
Merge branch 'frankpw-master'
Minor