Fix deploy on heroku
Move messages to top