Menu Bar "Fully" Works

Updated menu bar to correctly work
fixed conflicts?