Some cleanup + polling UI