changed way to build HTML