Menu returned back for category/group/product details pages + small refactoring and small bug fixes