Put arrangement within <p> tags and prevent some unnecessary empty tags

We still have an empty tag problem elsewhere.