Bug fixes from previous UI changes and cleanup