UI improvements and bug fixings