fix screen swap, fix second infobar