Ui system improvement + random wave