Ui fixes + general bugfixes