UI improvements

Thanks @pulser