fixed buttons, moved buttons, UI xml is done or 90% done
Once more...
Merge branch 'pablofork' of https://github.com/CMPUT301W13T11/FoodBook.git into pablofork