Fixed User button coloring
Joe made a stupid
Removed useless CSS
Fixed merge conflicts
Merge remote-tracking branch 'upstream/master'