Structural improvement

same html element used in both pages.