UI, icon, and clean up