Add Category View + Fix the Database bugs