Minor color adjustments and bug fixes