Made GUI a little cleaner, still not really pretty…