Updated to look for buttons and new link