[GF] [00000000] Updating track selection dialog and applied small refactor