Some UI and code cleanup