Added selectable AltitudeModel for Layers and some Layout tweaks