Ui fixes and improvements