Improve legacy page layout a bit