fare cleanup and ui fixes
Merge pull request #4 from sagar2305/develop

fare cleanup and ui fixes