Fixed several bugs and cleaned up the product form. TRAD-12 #time Fixing bugs and cleaning up UI