UI logic improvements