code cleanup
code cleanup
Fixed auto-merge conflict
Added airspeed gadget and artwork for it