Updates to User interface and UserStore implementation