Remove unnecessary spans
Move navigation links to right block
Create link pages