finished integration of new BaseActivity classes