Fixed sizing error and double toolbar.