User interface changes. Various small fixes etc