Removed useless test
Fixed layout links
Cleaned up the related site and special links
Adjusted active state in menus