#660 Committing modal changes prior to merging in 642 and moving modal and button to correct page