Fixed category-menu-*
Fixed logo
Merged