make sure there are correct links on pages
pull the updates from Ade about style changes
fix the merge conflicts and did some formatting of the code
Merge pull request #24 from yinansong/master

Fix Links on Pages