reworking html page, more dynamic and granular