Trip, account, merge design

Lots & lots of goodies. I'll come talk you guys through this.