#806 - fix ordering issue and checkbox issue