Made GUI improvements