Update app with UI improvements and fix #19