Fixed some markup ugliness