gui fixing in progress