css fix and image fix
edit and colorpicker changes
Merge branch 'brian'