Add a core data support, refine the category picker view