Fixed User view, modified dashboard