UI and bug fixes.