changed html structure to modular format