user profile & tags
front end
basic style
conflicts fix