Misc UI related fixes