some work done on the layout