further work towards new layout style