Create ride layout
Merge branch 'master' into registerRide