Nitpicks from Martin and others

https://trello.com/c/VZyC3GMx/144-martins-nitpicks
if you swap the last user in the list, there won't be the any item with the same index. You need to check for that.