A few UI changes and bug fixes