Merged UI into app

Fixes #2