Added AwaitTrigger capture state
Put context bar back on the same row as the other toolbars