add blocks, remove manual menu block code