Styling
New layout
Merge branch 'heroku'