add navy and dark to FR
new order form

rebuild order form in idraw