GUI made better