changes for label layout
fixed tests