More selection model, and changed some links back to buttons
Fixing tests