Revert Manifest to Emily's version

Also added Guy's changes, ie new activities and default to login screen