Improve Layout page