clean-up table_view changes by moving around table_view and add_settings