Ui and bugfixes