Add anchor and fix more button criteria MJ-636

All tests passed.