Near Final Update
Update to support 3 columns
Update to columns on shop pages
Merge branch 'development'