make layout management works again