Drive v2

Merged Drive redesign changes from private branch.