Improve page layouts