Updated to support app hub based suite bar and few optimizations.