Squashed a few bugs, adjusted UI colors