Fixed collision errors

Fixed collision errors in Menu & GameState