Feature/ux fixes