label column added and entity navigation improvements