UI related minor changes