Refactored layout for Heroku