change messages order and fix message margin
Merge branch 'master' of github.com:kymtwyf/TravelSteward