starting to move to new ui, various fixes