Added airline and some fixes to the viewer.