table
fixed conflicts
started the settings header