Clean up and UI work.