Updated menu for new GoC template and fixed tag issue