CLEANUP: more cleanup of main_widget