Markup changes, heroku ready