Moved hardcoded menus to block and some other fixes.