Updated basic gui