Made GUI Better