Refactor configuration for shortcode and update for submenu