adjust method pushActivity and popActivity