Ui and other improvements