Craig - button color
Craig - merge
Craig - build and fix some shiz