Fix start time
Merge remote-tracking branch 'heroku/master'

* heroku/master:
  Fix start time
fixing layout