Start to improve the default pages #2