Slight fixes to markup