Added links between pages and new settings
Merge branch 'master' of github.com:abarax/abarax.github.com