Adaptation

Adapt to look more like the reference Application