major ui fixes