Cleaned up code - added changes to android

-Cleaned code up
-Copied the menu changes to android
-Fixed some volume issues in android