more gui improvements & fixes