Revert "Small adjustment to push to server"

This reverts commit cf936e83b9d65f734a686869639610de51a44cf0.
Revert "Added a cancel and save diaparam options to the new Popup"

This reverts commit 2838885fc62b3528d8cd3b460903d29672dc4a11.
Revert "Start of UI changes for categories"

This reverts commit e72ced453e47096f10ac4d78c3d6aef4272bbe33.