Fixed Android rotation issue, code cleanup

Screen rotation fixed, will not exit to main screen anymore.