new column layout
merge conflicts from working-branch
resolved HEAD=== merge conflicts pagination still needs fixing