improve structure of several front end pages