Airlift Refactoring

Airlift is a daily commute service here in Pakistan. but their UX is very complex, I have tried to Refactor some of their parts to make it look cleaner / Minimal Clicks....