Grid refactoring. Menu section