Removed some menu code, added onPause and onResume handlers