Removed unnecessary calls of TOOLBAR_CalcToolbar() (which would be