Merge branch uirefresh. Major UI overhaul.