making partials for user view
resolved merge conflicts for user views and partials