Data grid moved to mixin,
Flight components refactored to more flight like architecture.