Add UserView, minor changes