Make some fixes to markup