Feature/ux improvements