fixes for 2.3
misc ui updates