Couple of fixes + GUI basics