remove empty groups
several ui improvements