Add anchor and fix more button criteria MJ-636

All tests passed. 

Moved from master merge since it's not a critical update.