Some UI improvements and more robust end of app