Fixes in design.
Merge remote-tracking branch 'Heroku/master'