Andrew Fix for Active Links

These are the fixes for the active links