Ui fixes

Various UI fixes