Fixes for AndroidManifest and linking the two screens