Cleanup and UI changes