tried to resolve some issues with html, hope it's good now