GUI fixed finally