Fix pagination button margin
Fix debug code not deleted
Merge pull request #2 from eddy03/develop

Fix bugs and debug codes