final changes to main layout
 completed edit activity
Revert "changed layout of category"

This reverts commit f2c22d6e603b386b5198f7e347c7f36076889fcd.
Merge branch 'work'