various cleanup for UI