Simplified the wrap in different pages

for easy formatting