Some fine tuning in the polling, UI