Changed gemfiles to work with heroku
Fixed a few positioning issues