added underscore to custom listing blocks, menu refactoring