major update on layout