Reorder/rename option menu
Preparing layout for crop/pick images
Refactoring / preparing back end to handle pick and crop.
Fixing option menu order