changed HTML construction for adapting server side dev