Merged UI into app