Minor fixes in markup