Updated Base Activity and Manifest file