Minor changes on markup