fixed user controller
fixed merge conflicts
span fix app html layout
fixed user show page and app css