Small changes to markup to make it prittier