(feature) adding User page merge from frontend branch