Cleanup and UI tweak