Updated toolbar handling
Fixed attribute funcs to handle null name in lookup