Updated Manifest and activity