Ui improvements and fixes for 2.3.