Consolidate Friendship reject, cancel & remove actions
Test tidying
Remove annoying confirm popups
Merge pull request #7 from LouisaBarrett/user-refactor

User refactor