Cleaned up AndroidManifest and the up button functionality (closes #121)