More fixes
Fix when going to twitter screen for second time