Merge pull request #757 from sexnothing/develop

BS3 pagaination update
Merge pull request #758 from sexnothing/develop

BS3 update
Cleaning up
BS3 update