Added Select map screen to close #4