added support for GM > 2.*, added UI elts