fix markup some more