Merge pull request #2187 from awesomerobot/master

fixing admin bar chart color
BUGFIX: mismatched braces
some basic variable reorganiztion