comment widget code refactoring
widget ui re-factoring