lots of changes for new ui, still in progress