re-factor activity w/ tabs