Minor changes to markup