Revision two of taking order screen working well so far