more changes to teh data structure and ui