fix color bug and add color button