fixed easy navigation & linking

Also using less php, should improve speed a bit.