major fix in gds (usability logic & layout)