fix some style and bugs
Merge branch 'master' of https://github.com/maggiemu/flight-bookings