refactored startActivity calls and fixed Android Manifest