UI progress, some changes to data structures