Category icon and keywords saving with category

#23 and #20