Fixed bugs in markup.