Fixed button coloring, moved goals button and added classes to reports button
Merge remote-tracking branch 'upstream/staging' into staging