Updated for website

re-formated for website. Need to fix colorpicker for timeout