Removed menu_block dependency