Bug Fix

fixed bug that cause trip to recrod for a few seconds when launching
the app new, bug introduced in last commit.

Also fixed a few UI issues.