GUI improvements are on their way...