Still more UI improvements and additions