Fix Database, add category grid view