Ui changes in main form , first_form and product_submit form
Changed layout on main.xml and product_list.xml
Fixed conflicts and merge changes