Combined UI with functionality

Looks like the old app. Works like the new app