Various UI key navigatation improvements