Various bug/ui fixes