Ui fixes as requested by Kharma during meeting of last Tuesday