Updated UI on general settings
Merge branch 'master' of https://github.com/johnpelquingua/freightbit-logistics