More work done to the layout