Wait block, tab control width

I took out the end wait and I added a maxwidth for the tab control as a
temporary solution.