Few minor changes in base activity/fragment