Add transport mode drawables, change meetup status layout
Fix conflicts and merge