Fixing up markup