Improve application layout's HTML structure