Some UI refactors; Sopport for Properties Group; Some JS fixs