Fix formatting; Change color picker