fixing few things related to UI