WIP: markupu and styles
markup tweaks and styles
fixed merge conflicts