Adding select user new UX

Contains fix for #31