fixed some layout consistency issues
fixed conflicts
added tab for map, fixed date/time
fixed carpool date/time
Merge pull request #83 from duanw/master

fixed some layout consistency issues