Updated app, general improvements and UI