added HmltRow to support js and css assets to the frontend
fixed merge conflict