Fixed pages shuffling.
Fixed refreshing thumbnail of new added page.
Some code refactoring and optimizations.