Merge pull request #17 from gatkin/layout-styling

Changed number of columns
temporary push
Fixed merge conflicts