More improvements on the layout