Social ride design

Pull the new design to master