Order edit page; bug fixes