This still needs to be rebased against the current master.  I would pull the changes to selection page into a separate pull request.