Fix Export Window + Fix Gira/O Import issue