Fix button linking bug;