Fixed menu screen issues by adding showButtons and refillTerritories functions
Fixed merge issue