Improve some pages