Better Implementation of finish state

Fixed the finish state to work with function call goToMenu instead
Merge remote-tracking branch 'origin/MaxxTesting'