cleanup git repo and implement ui ordering and batch loading