Added app UI, plus some formatting