GUI update + Mask system added