Moved menu wrappers out of render array and into template