Merge "Update the drawer UI." into nyc-car-dev