Some more changes related to UI

-- robin