Fixing markup formatting