some fixes in markup