Mostly ui fixes