Was able to finish transit buttons.
Committing the transit buttons
Fixed conflicts with my branch