Fixing toggle and changing links