Remove call for nav find by id.
Update order layout