A lot of UI changes and logic bugfixes.