Added form fields add uploader

Cleaned up code. and color fields. add saving function