added category management
Fixed menu layout