fix markup, update style and script