data update / layout improvements