A few UI related changes, mostly for @abenari to review