further work on layout