UI update, things much neater