Move design polishing, adding ability to change order state & currency