Merge pull request #58 from daymun/master

fix nil layout
fix pagination
Merge branch 'fix-pagination' into dev