Refactored code to use abstract baseActivity, made slight UI changes