Fixes #42
Merge branch 'master' into Pagination
Minor css changes