cosmetic fixes
fix pagination
Merge pull request #52 from lvl0nax/63-fiancee

63 fiancee