working on order review screen